Skip to content

Use xray context span id when it exists #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

danielebra
Copy link
Contributor

What does this PR do?

Address conditional runtime error when the xray context doesn't exist.

Motivation

Encountered this error when running the extension on a lambda with SAM local.

[ERROR] 2023-11-29T01:44:35.868Z        56c0ddf8-9de9-4006-89a0-e46b7cace0f8    Error 'NoneType' object has no attribute 'span_id'. Traceback: Traceback (most recent call last):
  File "/var/task/datadog_lambda/wrapper.py", line 288, in _before
    set_dd_trace_py_root(trace_context_source, self.merge_xray_traces)
  File "/var/task/datadog_lambda/tracing.py", line 607, in set_dd_trace_py_root
    if xray_context.span_id:
AttributeError: 'NoneType' object has no attribute 'span_id'

Types of Changes

  • Bug fix
  • New feature
  • Breaking change
  • Misc (docs, refactoring, dependency upgrade, etc.)

Check all that apply

  • This PR's description is comprehensive
  • This PR contains breaking changes that are documented in the description
  • This PR introduces new APIs or parameters that are documented and unlikely to change in the foreseeable future
  • This PR impacts documentation, and it has been updated (or a ticket has been logged)
  • This PR's changes are covered by the automated tests
  • This PR collects user input/sensitive content into Datadog
  • This PR passes the integration tests (ask a Datadog member to run the tests)

@danielebra danielebra requested a review from a team as a code owner November 29, 2023 02:01
@danielebra danielebra changed the title Extract xray context span id when it exists Use xray context span id when it exists Nov 29, 2023
@purple4reina
Copy link
Contributor

Hey @danielebra, thanks for catching this! Your PR looks good. I'm going to edit it and add some tests. I can get to it within the next couple of days.

@danielebra
Copy link
Contributor Author

Thanks @purple4reina for improving the PR further! Appreciate your support

@duncanista
Copy link
Contributor

Thanks everyone, this will be shipped early next week due to a current Code Freeze on our side.
This will be closed once #401 is released.

Thanks a lot for your (first(?) contribution @danielebra!

@danielebra
Copy link
Contributor Author

Thanks everyone for helping get this across the line, first contribution to this repo from me.

Closing this PR as it has been actioned in #401

@danielebra danielebra closed this Dec 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants